Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 11 Jan 2012 06:55:35 +0000 (22:55 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 11 Jan 2012 06:55:35 +0000 (22:55 -0800)
commitb2e6753acc23459c2d1839a88c4a3bfc29fbbdd4
treeed8252df6410eb8dfb86525094749e8b6d5118d6
parenta7ed49a0fddf633a0c09315fbd8ad14c285f52c7
parent660363f2386c84fe45a6a19dcf0fc115ca954f15
Merge from trunk.